From 21b46d41aa699e4f8bf04c227500a8ec61e9e427 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 14 Dec 2025 19:53:19 +0200 Subject: [PATCH] irqbalance: update to 1.9.5 Update irqbalance to version 1.9.5 * drop the original local meson patch, as meson is now properly adopted by upstream. But patch meson.build to keep glib2 library statically linked in order to avoid a dependency and indirect size increase. * disable unnecessary functions via meson features settings (capng, numa, systemd, thermal, ui) Signed-off-by: Hannu Nyman (cherry picked from commit 65d83de7f8b6969f1aa04895ddf20cc7ba690248) --- utils/irqbalance/Makefile | 9 ++- .../patches/010-meson-set-glib2-static.patch | 11 +++ utils/irqbalance/patches/010-meson.patch | 76 ------------------- .../100-remove-libncursesw-dependency.patch | 11 --- 4 files changed, 17 insertions(+), 90 deletions(-) create mode 100644 utils/irqbalance/patches/010-meson-set-glib2-static.patch delete mode 100644 utils/irqbalance/patches/010-meson.patch delete mode 100644 utils/irqbalance/patches/100-remove-libncursesw-dependency.patch diff --git a/utils/irqbalance/Makefile b/utils/irqbalance/Makefile index d84bad319b..558f51b596 100644 --- a/utils/irqbalance/Makefile +++ b/utils/irqbalance/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=irqbalance -PKG_VERSION:=1.9.4 +PKG_VERSION:=1.9.5 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Irqbalance/irqbalance.git PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=0521b15bb15ad46704ccf65f7ae683a47d54e7bae57fbe4e2a4341da6d424e58 +PKG_MIRROR_HASH:=a9d53209c5e31503cdc61518ca5887bb01cf1dab546928272a9aa7051713e4be PKG_MAINTAINER:=Hannu Nyman PKG_LICENSE:=GPL-2.0-or-later @@ -43,11 +43,14 @@ endef MESON_ARGS += \ -Dcapng=disabled \ + -Dnuma=disabled \ + -Dsystemd=disabled \ + -Dthermal=disabled \ -Dui=disabled define Package/irqbalance/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/irqbalance $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/irqbalance $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/irqbalance.init $(1)/etc/init.d/irqbalance $(INSTALL_DIR) $(1)/etc/config diff --git a/utils/irqbalance/patches/010-meson-set-glib2-static.patch b/utils/irqbalance/patches/010-meson-set-glib2-static.patch new file mode 100644 index 0000000000..02d58f1f0d --- /dev/null +++ b/utils/irqbalance/patches/010-meson-set-glib2-static.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -6,7 +6,7 @@ project('irqbalance', 'c', + + cc = meson.get_compiler('c') + +-glib_dep = dependency('glib-2.0') ++glib_dep = dependency('glib-2.0', static: true) + m_dep = cc.find_library('m', required: false) + capng_dep = dependency('libcap-ng', required: get_option('capng')) + ncurses_dep = dependency('curses', required: get_option('ui')) diff --git a/utils/irqbalance/patches/010-meson.patch b/utils/irqbalance/patches/010-meson.patch deleted file mode 100644 index 9418e1c2b2..0000000000 --- a/utils/irqbalance/patches/010-meson.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 35072fc06b9efe923f6ac1bd73b67c33d3ae619b Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 10 Jun 2022 23:14:27 -0700 -Subject: [PATCH] add meson - -Signed-off-by: Rosen Penev - -[update version string to 1.9.4] - ---- - meson.build | 43 +++++++++++++++++++++++++++++++++++++++++++ - meson_options.txt | 11 +++++++++++ - 2 files changed, 54 insertions(+) - create mode 100644 meson.build - create mode 100644 meson_options.txt - ---- /dev/null -+++ b/meson.build -@@ -0,0 +1,43 @@ -+project('irqbalance', 'c', -+ version : '1.9.4', -+ default_options : ['warning_level=1'] -+) -+ -+cc = meson.get_compiler('c') -+ -+glib_dep = dependency('glib-2.0', static: true) -+m_dep = cc.find_library('m', required: false) -+capng_dep = dependency('libcap-ng', required: get_option('capng')) -+ncurses_dep = dependency('curses', required: get_option('ui')) -+systemd_dep = dependency('libsystemd', required: get_option('systemd')) -+ -+cdata = configuration_data() -+cdata.set('HAVE_GETOPT_LONG', cc.has_function('getopt_long')) -+cdata.set('HAVE_IRQBALANCEUI', ncurses_dep.found()) -+cdata.set('HAVE_NUMA_H', cc.has_header('numa.h')) -+cdata.set('HAVE_LIBCAP_NG', capng_dep.found()) -+cdata.set('HAVE_LIBSYSTEMD', systemd_dep.found()) -+cdata.set_quoted('VERSION', meson.project_version()) -+cfile = configure_file( -+ output: 'config.h', -+ configuration: cdata -+) -+ -+if cdata.get('HAVE_IRQBALANCEUI') -+ add_project_arguments('-D_GNU_SOURCE', language: 'c') -+endif -+ -+ -+executable('irqbalance', -+ 'activate.c', -+ 'bitmap.c', -+ 'classify.c', -+ 'cputree.c', -+ 'irqbalance.c', -+ 'irqlist.c', -+ 'numa.c', -+ 'placement.c', -+ 'procinterrupts.c', -+ dependencies: [ glib_dep, m_dep, capng_dep, ncurses_dep, systemd_dep ], -+ install : true -+) ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1,11 @@ -+option('capng', type : 'feature', -+ description : 'Build with libcap-ng support', -+) -+ -+option('systemd', type : 'feature', -+ description : 'Build with systemd support', -+) -+ -+option('ui', type : 'feature', -+ description : 'Build the UI component', -+) diff --git a/utils/irqbalance/patches/100-remove-libncursesw-dependency.patch b/utils/irqbalance/patches/100-remove-libncursesw-dependency.patch deleted file mode 100644 index 917a46dacd..0000000000 --- a/utils/irqbalance/patches/100-remove-libncursesw-dependency.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -41,7 +41,7 @@ PKG_CHECK_MODULES([NCURSESW], [ncursesw] - AS_IF([test "x$has_ncursesw" = "xyes"], [ - AC_SUBST([NCURSESW_CFLAGS]) - AC_SUBST([NCURSESW_LIBS]) -- LIBS="$LIBS $NCURSESW_LIBS" -+ LIBS="$LIBS" - AC_SUBST([LIBS]) - ]) - -- 2.30.2